Don't use depecrated features or reduntant declarations in Makefile.am

Patch from Gary V. Vaughan

svn path=/trunk/; revision=405

diff --git a/ChangeLog b/ChangeLog
index 93c85772432d3cb74fd7d56a1949e860faeb4f84..b1e555d19ef3b5a6dcd17595dce98f35d5d6ade2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-03-25  Martin Nordholts  <martinn@svn.gnome.org>
+
+       Patch from Gary V. Vaughan. Don't use depecrated features or
+       reduntant declarations in Makefile.am
+
+       * babl/Makefile.am
+       * babl/base/Makefile.am
+       * docs/Makefile.am
+       * tests/Makefile.am
+
 2009-03-25  Martin Nordholts  <martinn@svn.gnome.org>
 
        Patch from Gary V. Vaughan. Support hpux use of shl load/unload

diff --git a/babl/Makefile.am b/babl/Makefile.am
index 25932bd8b72cc7ce2be93730424085f96df2f2cb..27580f453c5b8f6704cbb4dc011a0861fed34ac6 100644 (file)
--- a/babl/Makefile.am
+++ b/babl/Makefile.am
@@ -56,9 +56,10 @@ library_include_HEADERS =            \
        babl-version.h                  \
        babl.h
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/babl/base
-
-AM_CPPFLAGS = -DLIBDIR=\""$(libdir)"\"
+AM_CPPFLAGS = \
+       -DLIBDIR=\""$(libdir)"\"        \
+       -I$(top_srcdir)                 \
+       -I$(top_srcdir)/babl/base
 
 lib_LTLIBRARIES= libbabl-@BABL_API_VERSION@.la
 libbabl_@BABL_API_VERSION@_la_SOURCES= $(h_sources) $(c_sources)

diff --git a/babl/base/Makefile.am b/babl/base/Makefile.am
index 4d85c5041d09da98472eef480eeb5031d1077aa5..1c1da0f5758a09861d0794695cdf967021678f54 100644 (file)
--- a/babl/base/Makefile.am
+++ b/babl/base/Makefile.am
@@ -13,13 +13,13 @@ c_sources =                 \
        model-gray.c            \
        model-ycbcr.c
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/babl
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl
 
 noinst_LTLIBRARIES= libbase.la
 libbase_la_SOURCES= $(h_sources) $(c_sources) 
+libbase_la_LIBADD = $(MATH_LIB)
 
 EXTRA_DIST =           \
        rgb-constants.h \
        util.h
 
-LDADD = $(MATH_LIB)

diff --git a/docs/Makefile.am b/docs/Makefile.am
index c8c2b5bc70929c86283b1e9e4b499c786d65a057..773d1ab227f7b30fec5c47dc46d53d7cec6c44b1 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,7 +1,7 @@
 # programs used for doc creation
 babl_fish_path_dhtml   = $(top_builddir)/tests/babl_fish_path_dhtml
 babl_fish_path_fitness = $(top_builddir)/tests/babl_fish_path_fitness
-babl_html_dump         = $(top_builddir)/tests/babl_html_dump
+babl_html_dump         = $(top_builddir)/tests/babl-html-dump
 
 .SILENT:
 SUBDIRS=      graphics

diff --git a/tests/.gitignore b/tests/.gitignore
index f7e9645dd3e1ee9084d2d98b31b5b7aff1b3e767..c48e0f5ba7e003e321493428bd70f0d10b66a7b8 100644 (file)
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,7 +1,8 @@
-/Makefile
-/Makefile.in
 /.deps
 /.libs
+/Makefile
+/Makefile.in
+/babl-html-dump
 /babl_class_name
 /babl_fish_path_dhtml
 /babl_fish_path_fitness

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 092f1f9d1c451d4e07647797c036b26d613f0a5e..360906b00a299891d3fcf3996bc0594ec60f0fbd 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,18 +10,6 @@ TESTS =                              \
 
 TESTS_ENVIRONMENT = BABL_PATH=$(top_builddir)/extensions/.libs
 
-grayscale_to_rgb_SOURCES        = grayscale_to_rgb.c
-rgb_to_bgr_SOURCES              = rgb_to_bgr.c
-srgb_to_lab_u8_SOURCES          = srgb_to_lab_u8.c
-rgb_to_ycbcr_SOURCES            = rgb_to_ycbcr.c
-babl_class_name_SOURCES         = babl_class_name.c
-sanity_SOURCES                  = sanity.c
-types_SOURCES                   = types.c
-babl_fish_path_fitness_SOURCES  = babl_fish_path_fitness.c
-babl_fish_path_dhtml_SOURCES    = babl_fish_path_dhtml.c
-formats_SOURCES                 = formats.c
-models_SOURCES                  = models.c
-
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl
 
 LDADD = $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \
@@ -31,12 +19,8 @@ noinst_PROGRAMS =            \
        introspect              \
        babl_fish_path_fitness  \
        babl_fish_path_dhtml    \
-       babl_html_dump          \
+       babl-html-dump          \
        conversions             \
        formats                 \
        nop                     \
        $(TESTS)
-
-introspect_SOURCES     = introspect.c
-babl_html_dump_SOURCES = babl-html-dump.c
-nop_SOURCES            = nop.c